Rearranging the whole project!