Reworked directory structure for better urls