Rearranged files if we'll want some more for the real part of the project