Clean up / refactor / wasuup brauh!  

Haven't added any features yet, mostly just moving stuff around.