Improving file structure and install procedure