Changed folder structure, updated documentation