Reorganised directories and added css