Reworked placement of class files to be more workable, there you go Kihira and iPixeli.