Restructured project and organized files into groups