restructured directories to make things more readable