Reorganization of input-files and user-files source code and rename ./macros/ directory into ./modules/ directory