Some changes to suit my needs

Changed file structure and moved my settings into the different files