reorganized project structure
fixed untracked files