Finished Optical Settings Implementations

Also:
-Found better file naming convention
-Code cleanup