Removed debug printing.
Moved all to main folder.