Continued work on initial code base, reorganized folder project structure