Changing directory structure to make things more clean.