Started to organize the project a little better