Rearranging files and code beautification.