Restructured folders in preparation, started taglib work