Test

Cleaned up the file structure a bit.