restructure directories for easier installation