Full cleanup

Organized everything into new structure