Better code layout

For the people who check that type of stuff out