Move src and includes to different directories