Added files and features
Organized some files