Code cleanup and directory structuring

A little help to my amigo.