Revert "Repackaged Files for Increased Organization"

This reverts commit 3f9132633f8d0ee07b0bb83d81d0f27a6b338c95.
Reverted Organizational Changes

Not sure how to fix Netbeans to be cool with the changes.