Restructuring and cleanup
Added pygmentized cat