Restructured project to use subdirs
Updated install settings