Made folder structures better
Updated stuff