Cleaned up source file
Reorginized File Structure