Changed folder structure, and moved Option and Section to their on files.