Rearrange file structure
Basic functionality!