Tidying up source code directory structure