Reformat & Project structure improved