Changed folder structure. Improved naming.