Folder restructuring

To make it suitable for packaging