Rearranged source and header files