Organized everything into single classes