reorganised dir structure for clarity
restructured directories