Restructured all code inside src