Re-organized directories to work like a proper package