Changed the whole directory structure, getting ready for plugins