Cleaning up structure, adding installation script