Did some restructuring and added Kubuntu support.