Fixed preferences and moved files to proper locations