Organize code
Remove unused files