Cleaned up folder structure a bit, removed unneeded files

Signed-off-by: Jdbye <jdbye3@gmail.com>