Beta

Organizational changes - Combining files.
Prep for merge
Merge pull request #1 from dimaahawk/Optimized

Optimized