Started some code organization