Reorganized files + source code structures