Rearrangment of files and code