changed dir structure for better organization