Finished

Minor corrections to better organise out.folder structure.
In progress

Changed the way file names are catched and selected based on the new
recursive folder structure.