Cleaned/reorganized some project files