Added return directives, started reorganizing

Needs more reorganization ._.