Cleaned up Sub-directory structure

Sub-directory structure is now more efficient, removed redundancies and
should shrink total file size, make manual installation easier.