Reworked folder structure to work with composer [ci skip]