Updated Source Code

Final source code edits plus organization folders.